Added viewtab support