Made CSS more and less modular