polishing and bugfixes
some styling