Tweaks and usability improvement