rename ui and other minor fixes