Fix some UI todos.
Merge pull request #132 from vmarmol/ui

Fix some UI todos.