Changing up the views for better UI