Fixed naming and few other errors on main pages