Moved tab divider drawing to be prior to indicator and underline drawing to ensure the indicator is always on top.