Styling and bugfixing