Update html on property changes
Update TODO's