cleaned up accept/reject and rematch buttons and some other tweaks