UI tweaks, and fixing lots of stuff..