Lots of changes in the animation stuff

Tried to implement the Upper and Bottom seperate parts, didn't work too
well. Start making a custom solution tomorrow.