Fixing up the appearance and tightening up routing.