*7885* Fixed Homepage form organization