Final commit, includes all new html/styling/javascript