UI Improvements

First pass at cleaning up the UI for the current functionality and making it more similar to the final visual design. It's not 100% yet, but it is getting closer. This should also smooth out the usability of the site while it's being tested in desktop Firefox this week.