Develop ui

milestone 4 changes