This is the commit for all changes, for merging This change involves both HAML and Vue, plus refactoring
