added custom layouts and better org routes