HTML & CSS Cleanup and Improvements