NOT FINISHED: Misc fixes

Various fixes to improve the UI of the site and clean up functionality.

This pull request also resolves #88 (same fix as #89).