Bugfix and css fix