Fixed problems with tabs