form positioning on home page
fixed merge conflict