added info menu/toolbar, cleanup