local commit
new items in same row, fixed navbar
Merge remote-tracking branch 'origin/master'