Merge "Minor UI improvements and code cleanup:" into nyc-dev