Backend +layout edited