add toolbar

tidy up interface