CSS, formatting, and button changes
Merge conflicts of index.html