more bugs in the UI... :)