refactoring and code cleanup
Modifying views and CSS