Added some changes to views (cleaned up code), integrated some of Ghassen's code for the frontend