cleaup and new menu functionality for ucp