Added sorting and better decomposition of views.
Fixed alignment in grid view.