Finished making code consistent so that empty button data is also dealt with correctly