Adjustments suggested by Alex
Merge pull request #221 from cardosogabriel/ALEX_UI

Adjustments suggested by Alex