Bug Fixes & UX Improvements