Added HAML and Javascript - not complete