General Improvement, working towards manageable CSS