Fix and improve Smart Property pages.

Contains all changes to fix #641