re-arranged buttons. moved comments that were at the wrong location