Some tweaks and UI enhancements