some adjust, total clean @extends  and new files to sass calls step#1