Improved input label naming and other minor UI improvements.