Cleaned up code and moved the new ZoomButtonPanel into master branch.