Enhanced the user-interface to be more user-friendly,