Hiab tablet layout to be tidied up