fix buttons, comments