More haml switching, css cleanup, etc