[P3]refractoring CSS to close #13