Some updates where tabs are used