Updated views and layout