Reworked the layout