added toolbar & ios7 support