General Tweaks

Made a few UI tweaks and fixed a couple bugs.
Merge pull request #24 from URWhiteboard/jacob-test

General Tweaks