Revamped most of the UI for consistency.
Merge pull request #45 from snwh/master

Made adjustments to the UI for consistency throughout.