Modified UI to remove redundant level of complexity