refactored ID names in layouts