url & layout fix.