Styling and bugfixes