Continue with passing first acceptance test

* More progress on passing first acceptance test
* Prettified UI a bit