Clean up router and make enter work to submit.