Tidied up layouts and views to make sure backup plan works when needed