bugfix

bugfix + minor design changes