Some tidy up with layout