Tidied up menu. Also hopefully fixed #19.