improvements made to ui and valiadation also