Lots of minor design adjustments
Merge pull request #372 from cardosogabriel/master

Design review / adjustments in the console