small fix - labels and UI improvements