Fix data route, add back button