Mobile views tidy-up