local fixes
initial Layout portal
initial working mas