General tweaks for better user flow. Added correct routes to back buttons.

Signed-off-by: Waldemar Figueroa <waldemar@nobox.com>