Restructure css styles