Removed testing vars and comment the new view button piece