Added basic tabs logic