Finally things are somewhat prettier

@as-cii just not ready yet, but it shouldn't take me much. In the meantime, please take a look at, if nothing from a aesthetic point of view.

More importantly, please do search for `TODO: as-cii` everywhere and help me fix'em if you could.

Thanks! :wink: