moar bug fixes for new user interface