update
layout mostly done