Refined menu to handle recreation (e.g. orientation change); added options submenu