Layouts and Routes now better