Removed class active and supposed to be conditional