Updated views layout