Several improvements to user interface