More changes on tab view template