Router & UI improvements.