Fix minor bugs and UI.