start redoing ui
go back to removing switch
add toolbar
get toolbar working