Refactor more JS to HAML.  Almost done breaking stuff