Cleaned up CSS further