Option menu: Tweak border; minor fixes