Feature/minor u ifixes

Fixes #145, #155, most of #116.
With code style fixes and some UI fixes since #156 and #157.