Create Modal Builder and Fix Bug