changed some buttons
small changes
fix merges