layout, detail fixes