Merged area.h and volume.h into geometry.h, plus added some menu functions.