Initial prototype of new layout