reworking haml and js (testing & app)