Add shortcuts, improve download methode