Enhanced the UI