Adding 'none' options; UI/UX updates