upgraded version to 21 and added toolbar