Minor UI Fixes (Cross-merge to 2015)