Fixing CSS conflic resolution from last commit