Some format and url changes