Minor bugfix and UI beautify.