Bugfix and styling