Few changes including flair padding