Improve routes and flashes