Fixing navigate back to theme listing
Fixing more navigation issues
Fixed navigation issues