Modify less structure and add different styling to the components