initial changes to UI

consolidating and removing.