saturday stuff: vote buttons, comments(without edit and delete)
merge conflicts fixed