Minor refactor + extra footer link