Added generic way to have pages inside tabs