changed gettab method and fixed some contentnavigation issues
fixed merge conflicts