updated for the frames controller and added the toolbar back in