Updated the views and themes to make it more pleasant