Improve toolbar and global styles