Fixes: added new ui stuff