Cleaned up some menu code