reworking a lot of the layout