added toolbar. couple other things