Layout: minor fixes and arrangements