Merge "removed navigationbar*"