Final Pass of Foundation UI Update