Deleting macros (move to form bundle)
Updating and fix bugs