User Interface Bug Fixes & Refresh