small bugfix and designfix