UI tweaks and some bug fixes