Remove unused includes + change re-open animation from LINEAR to CUBIC