missing space and UI tweak