Misc UI fixes
Merge pull request #482 from sgomes/material-sprint-UI-fixes

Misc UI fixes