fixes by screenshots 31.07.2015