Fixed bugs
Fixed modal height