Layout with views integration

introduced destinction between layouts and views