Feature/ui appearance

It should be cleaner this time.

This replaces #3