Remove fade dependency
Add expand animation that re-starts everytime