Restructure css