Improve user interface again, and prepare for fever mode