Added modal macro. Added form inline radio