*Corrected widget property argument due to find/replace refactor
*Corrected model property names
Merge branch 'development'