Resort list, minor markup fixes
Add johnny-cache