UI improvements, minor refactors.