fixed staff images bug
merged changes from origin/redesign2