Feature/club tabsfix