finish implementatin of new tabbed layout