Fix compile warnings
UserInterface improvments