Modified universal layout. Fixed convention issues.