Fixed modal problems
Fixed modal completely