Minor UI Fixes on Request