Fix subForm
Start to implement macros