cleaned up and consolidated views and home template