tidying up the main layout