rescaffolded things with haml, got rid of test