Angular fixes
images
Merge branch 'feature/angular_fixes' into develop