Removed angular, finished layout, implemented everything.