Url class fixes
Change layout fixes