Working on animations and fixing headers