added working sort buttons
merged sort with dev and solved merge conflicts.