first batch of changes for a simpler ui
more simple ui
ui changes final