Sorted the layout

Basic but seems to work fine.