UI update and added a few options