Refactored css, and subsequent js & html modifications