Cleaned up and added new view page