Tidying up views to align with design