fixing button size
fixed merge conflict
fixed that /div tag, removed a few more buttons
resolved conflicts with /div