Fixed menu display bugs, added MOTIF: selection option