Cleaned up CSS hacks