Modify layout

Changed around a bit for readibility