[hw6] fix layout issues