added some ngClasses for working with css transitions
Fixing merge conflict.