Design/usability improvements
Implement UI changes by Gabriel
Merge pull request #383 from ammendonca/cardosogabriel-45bd763