Fix manual ui issues