General Tweaks

Made a few UI tweaks and fixed a couple bugs.