Updated views and layouts