Fixing form positioning
Merge conflict resolved