Minor logging and UI labels changes