visual modifications
Merge branch 'developer/andres' into develop