Some corrections in the layout.php and random stuff