Added sorting options and fixed some options loading challenges