Bug fix: Layout shoul pass URL as an object