Adding more views and functionality

~Heather