removing modalform and merging it into modal pattern