Afelipe merge changes

Complete app changes