Fixing career display
Merge branch 'develop'