Bug/tabs title update

Ready For Merge