CSS overall improvement