MINOR BUG FIXES & UI TWEAKS