Animate program selector

And minor code clean up