added Expand to Fit Option