Buttons fix, code clean
Windesheim
merging errors
merging conflicts fixed