Removing transitions.html and minor refactoring