Fixing CSS issues