Fixing tab issues