layout fixes and added category section
Merge remote-tracking branch 'origin/master'