reworked the layout