add toolbar and simplifiy a few things