Tidy application to match design