more reworking the layout