still fixing tab problems