Layout moved to layout branch

Done without merge with previous version