Improved url structure to be able to use only ctype or non ctype urls.
Small fixes and improvements.