Improve & UI tweak