added nicer routing and modded layout