Update master with fragments and tabs