layout mostly done now