route/list html adjustments
html/css adjustments
Merge remote-tracking branch 'origin/master'