Issue #114 - Polish UI according to spec.

Polish UI according to spec.

https://github.com/gaia-local/gaia/issues/114