Initial refactor commit
CSS/HTML changes. Everything is in working order