-fixing and adding layout stuf