pulled prototype changes into main layout