Speed and slight menu tweak

Really should go and have a shower now