Cleanup to get navigation, zfcuser and bjyauthorize working