Feature/bug fixes

Theming adjusted and some bugfixes