Adding z-index variables, cleaning up nav positioning