Better urls and added a generate button