Removing some functionality; shifting main page around
Minor miscellaneous UI changes
Fiddlin'
Merging