Slight UI Fixes, major ones coming later