Toolbar for buttons in containers, added buttons for calculate - future
work.