Add user admin functionality and cleanup UI