Menu overhaul

In an attempt to fix connection problems