cleanup, ui bugs, indicate user about admin rights