Completed new STA, refactored expedition views