Try Settings>Interface>Skin>Configure Skin>Home>Customize Home menu… These location changes were made by Kodi when moving to 17.
Don’t be afraid to poke around and investigate all of the settings menus. Just don’t change any of the settings themselves if you don’t understand them.