Updated views and styling