Updated Layouts and Routes