bugfix + styling