Some UI updates to options menu

Related to #193 and #16