Refactor css structure

Related to #3025 

cc @skyruler @DouweM @rspeicher @vsizov 

See merge request !1571