finished issue 6 and refined the layout tool