Polish up layout and routes