Updated views, refactored html code