revert comits

going back to before the UI screwup