Black and white design

pull bugfixes