#261: changes on layout