MAD BUG FIXES YO
Merge pull request #692 from zakkain/ui-tweaks

MAD BUG FIXES YO