Continued work on tab templates