UI Tweaks

Check out the commit messages :]