Adam/hide tabs if not enrolled rebase 2

@doctoryes