Glass options and finish grid layout fix