Corrected the issues with tabs