Slight adjustments to look and feel