Refactor code with Elyse and removed sticky footer