Improved styling and bugfixes