Fix UI
Merge pull request #1517 from diegoaossas/master

Fix UI on Settings Form