Updated Analytics code, updated invalid status, GUI changes