Merged code that uses a standard toolbar instead of the custom one. This will make iOS 7 support much easier.