delete empty
move out toolbar stuff and better style it
remove unused, this is in mockup