Fix Loading ... message positioning
Refactor