mainpage design and form changes
fix conflicts