routing and visual cleanup