Revamp CSS Part II