Initial integration of changes from Sam Harwell
Fix spelling of property
Rework look and feel and the way