Fix component links and cleanup