fix several bugs with custom websites