bugfixes, changed buttons