add toolbar and fix gui layout