buttons working and animation started
merge conflict fixed