Sort fix + bedre clickdetect