CSS bugs fixing