Fixed options UI / function