finished up layout and routes