Fix sorting bug and login image