worked through remaining layout