Did more work on the layout

As well as minor details