Updated views and clean design