Major CSS make over, and some optimizations