Tabs bugfixes and some features