Finished adding values into the database and making the views more readable