customer changed to user, and changes to haml files