Added sliding animation (in progress)
Resolving merge conflict