UI Fixes
Moar UI stuff, tiny fixes