Buttons fix, code clean