adjusted layout a good bit