made green buttons slightly bigger
fixed merge conflict