Add the option URLs and some cleaning up