Added new views, sorting and cleaned up some sync code
Added sorting