Updated version number.

Changed version number which should have been in previous check-in.
Minor changes to layout, property ordering, etc. No functional changes.