changed layout
Merge origin/master
changed sorting of data