8.5 AT Issues

Hi, I just updated to 8.5 on the auction theme and I have a few issues with the update.

First, is there a way to stop the 3 new tabs that appear with the search bar in Top navigation. I have chosen top navigation, logo and search and I get unwanted tabs of message, bids & won?

Also where is the listing packages selection page disappeared to? I prefer a user to select the package from a table rather than over in the left hand column on the ‘add listing’ page. Can there be an option for this?