Navigational UIButton & more changes