get rid of list, convert erbs to hamls, minor optimizations