Added two more actions to toolbar and made the bookmark form toggle a class.