New properties forms (WIP)
Small refactore