Fixing issues with tabs - some still remaining