Changed tabview structure