Added compenent jump for admin
Merge branch 'develop' into user