Need to restructure this terrible menu code

Also updated Californium again