add wrapper to stylesheet, changed buttons and xml-files in layouts