Fixed positioning of modal warning
Merge fix