Add sorting feature
Style fix
Add several sorting keys