Changed layout, added AngularJS, refactored some code