updated assets and haml support