Add Modal module and bug fixing