Updated layouts loader
Updated components loader
Fixed bugs with new layouts and components