Merge #36: Options widget