simplify success logic, and use mail function the way its intended. Also restore the global navigation to the top of page